Adding tests

Goal is to get 99% test coverage. At 80% right now.