restructured ui tests