Unit tests3

added more unit tests.