Previous commit will not work if there's a man in the middle
Made perltidy happy
Fix test for b9a3fe61fb674163672d7c2b040be43280cf5650