Use unittest2 instead of unittest in a coupl of places for 2.6 compatibility.