Refactored structure for testbase