Fixed: failing tests due to changes in base test class