Fix to bitmap tests