[549655] Fix debugger test
6 files changed