Fix test script bug
Merge branch 'develop' of github.com:MadeiraCloud/salt into develop

Conflicts:
	tests/step.sh