Updates to test cases for them to work with 2.7.4