Cleaning up new test framework