Fix error when preparation of the change before setVisitor
Add tests for changes of 5.4