Fixing bufferreader bug
Fixing tests