Make a few changes to make tests pass - all pass