Move testing to unittest2