Fix failing tests for UFPE