Phpunit

Merge of Namespaces Branch into PHPUnit Branch