Update tests
add test cleaning, refactoring