#1 fixed tests