Added some additional tests for input stream, made more robust