Partial test suite fix