minor changes to make tests pass