Fixing read limit issue. Added tests.