Moved scrub tests to their own file