refactor tests
finish refactor ui tests