Fixed failing tests on debugger due to latest changes.