#74 fixed breaking tests