Minor fixes to help unit test creation