Adding ui tests.  Improved folder naming