Cleaned a couple of things up, and started putting together some unit tests