Updated tests for 5.3