Use new test class