Cleaning up the draw test