AND test fixes