test fixes

Fixed some tests from my change that weren't quite merged correctly. Also not sure if 2.3.3 got published.