AUI-1173 Remove unecessary logical branches and dead methods
AUI-1173 Adding surface tests