Add reader for test files, fix things