Slight refactoring of tests and reader.
Remove "x" attribute from test file.