Moved the unit tests to scenario based tests.