Improve the NOT_IN_PAD error message
Add more tests