WIP
Add some tests for Reader