testbase refactor