fixed separation of unit and ui tests
fixed paths