test fixes and workarounds