Tests now use class-based unit tests.