New painful test case
Make new test case pass and fix location bug