modifying more tests