CFY-648 cleanup, make rest tests pass