refactor more tests
remove deprecated dependency from uitests