fixes to unit test facilities