Completed test suite. Simplified json file