Remove tests on 5.4
Issues fixes