Unit test fixes or work-arounds