change the test class directory to be variant agnostic