hw7 fixed tests