Slim down on testing