Improve EntityPath test #626