Updated unit-tests.
cleaned up.