More unit tests, a little more built out