Improve sentinel tests