Upgrading debug info test cases to be (more) compatible with the current debug info...