corrected some failing tests