Patch up testing mess