edited UI test arrangement
fixed UI test server tear down
Merge branch 'master' into ContentSelector