Mess around with data model, fix tests