Corrected some tests