Added some more unit tests, and some other changes to repository...