Fix a bunch of scaffolding and unit test complaints.