Reverted reverting +1 in line numbers of debugger test, fixed test data introduced by merging with master.