chore(cleanuo): clean some code parts
chore(tests): clean some code
fix(tests): resolve test issues