Changed JSON stub process
Merge branch 'TestRefactoring'