fix BC breaks in tests. make them work on 5.3 again