Got away from the test first mindset.  Trying to add tests now and make sure the behavoir is correct.