Tweaks to test-suite expectation as we move towards classes.