Clean up some commented-out stuff, fix up sql evolutions and add extra test data