Fix unit tests on 5.3