Rework tests after reorg.
Proofreading README
Fix typo in namespace declaration.