Unit test fixes, still phptidy file output

exce output non-standard and not worth debugging to be valid, since it's not all that informative