Merge "Change all non-slow scenario tests to smoke"