Add more phpunit tests