make tests thread-safe
json-simple is not required in runtime
Merge branch 'master' into develop