Fixed tests to work with new JSON format