#26 fixed tests