bitmap test fixes