More polynomial testing, plus a bug fix.