Refactored UIProvider and fixed JavaEE tests