Cleaner handling of test files
Less output noise