get more surface tests to pass