fixing tests for 5.3