WIP, fix some tests after schema change