Adding bounds checking for 5-13 and tests on that