Added unit tests

Added more unit tests.