StateHelper test
remove 'Test' from creator name
Merge branch 'master' into public