Changes according to new base test class