Clean up JsonFileStore + Spec #13