Added test for JSON job store
Merge remote-tracking branch 'origin/develop' into develop