Implement more robust tests in Salt states

Change-Id: I0aa5038f24b3073e7f8bed1bdcea5bbe5a31ade4
3 files changed