Fix failing tests due to changes in Uberfire