We can do it when we have a stable version of BaseTestClass to merge it simply.