Fixing testbase code