Removed strict tests for the json file storage. Removed duplicate code