Fix tests that assumed things about implementation details