Added unit tests

Added additional unit tests.