Fix some tests following the removal of Num's superclasses