Specify user defined test
style
Merge remote-tracking branch 'upstream/develop' into stateTests
Merge pull request #533 from CJentzsch/stateTests

Specify user defined test