-Addressed stuff for #251.
Merge pull request #257 from mmcguinn/namespaces

Testing fixes.