fix step ambiguity in test
Merge branch 'master' into gaplugin