Tweak to remove leading / in some cases, test failed on EC2.