Added tests, fixed off by 1 error