All unittests apart from tokenizer related ones now pass on both 2.7 and
3.3.