Updated More Tests

Fixed errors in my code I never caught before.  Fuck yeah tests! X'D
Fixed Bug

Off by one error! :trollface: