Huge cleanup of tests

Removed rimrafing and content checking of files.