Rejiggered namespaces so phpunit would work