Front end testing fixed for current ui
merge conflict fixes
outdated test removed