small changes to make tests pass