Refactoring, updated test JSONS