syntax fixes for test-utils