Fixed up tests, and got working boundaries