Corrected some unit tests