Changed data format and updated tests.