Added phpunit..xml
Added handling for specific types