phpunit tweaks

Change-Id: Icc2d3fa058ebacf4eaff08df2eb3325afa0447c9