Merge "Disable tests not compatible with current shell transitions"