Modified Unit-tests.