Remove extraneous stuff from tests, move super save to bottom of method