fix tests - move to new schema