Updated tests after surface(invert) change