Fixed eve tests for new format data, is still broken for old