Added more phpunit tests ...