Further fixes/clarifications to updatecode tests.