Possible tests fix 5.5