More unittests pass for mangling