Another attempt to correct unit tests