minor fix; updated phpunit tests