#35 fixed tests