Add more test data, change format