Update test syntax for serverspec 2
Merge branch 'master' into evertrue/eherot/create_mock_test_environment