changed cleaners to scrubbers, added pre and post test