Merge "Reduce the number of "smoke" tests"