[BZ 1049054] fix failing tests
[BZ 1130162] Add intentional-changes for the remote-interface