Begin adding real unit tests