More cleanup of inherited code before creating test cases