Fixing a couple more case-sensitive test issues