#7 fixed tests