More test mangling