Updated the tests to work with the latest 1.5 fixes.