delete 2 tests
add 2 tests back
Merge remote-tracking branch 'origin/UI'