Tweak to make tests pass