Bump to latest testtools, and use final 2.1M3