Rename keys and get rid of null filling
Consistency!
Update testing data