Improve Portal ETE test suite stability