CFY-747/CFY-352: prefix -- fix tests, now for real