Cleanup test code, no change to class