Simplify read of test files