refactored ui-test project

Refactored the ui-test project per Mark Jennings request.