Updated unit tests
Updated unit tests