Added more config + removed base test classes