Corrected some unit tests (untested)