restructured ui tests
restructured ui tests