Fix tests to work with 5.5