Adjusted for the new TestRunner test class. This replaces %gcc and %g++ with