Adding some more unit tests and some unit tests method stubs.