made some minor tweaks to PHPUnit assertions