Remove namespaced code
Use long-hand ternary for PHP 5.2
Merge pull request #490 from rmccue/fix-tests

Fix testing suite