Added a test for the new input readers and fixed a couple of bugs