small fixes for gold test cases