Correcting more tests