Some scaffolding fixes.
Fix some unit test issues.