test fixes for 3.2 && targrep ticket updates