Change some import and change unittest according to new version.
Merge branch 'testing'