Short test
Don't need extra strlen()
Tidy things up
More decrufting