Fix two unit test issues.
Fix a unit test error.

Conflicts:

	src/resmom/test/mom_server/scaffolding.c
Fix one more unit test complaint.