Updated tests to be 5.3 compatible