fixup tests after moving packages around