minor change in test
Add "core" namespace
code cleanups