- Reader refactored
- Test refactoring