Moved scenarios for tests to the corresponding file