Unittest Move and fix errors