The amount of unittests for this change seems a bit excessive :P It's also using the old style of unittesting. This is badly documented (as in, not at all). So I'll leave it as is and add a shorter new-style unittest myself :)