TEST: Updated unit tests.