minor fixes to test and support classes