Unit Tests

- Did a lot of work on unit tests, but I have other more important
stuff to work on right now.