Add more position information to improve precision
Add two more failing tests