Add unit tests, fix a few things
bump