Fix: do not empty PHP include_path when testing, breaks PHPUnit
Fix: improvements to new by-order results from parsing