#51 make tests pass