Updates to support phpunit 5+

Merge pull request #13 from timheilig/perf_problem_with_differ

Perf problem with differ