Some more unit testing and other changes to the repository...