Finished migration to scenario-based tests.