Upgrade to unittest 0.5.5