Fixup class prefix tests