Unwip some crud tests