Format
Extract tests to test namespace
Remove no longer used namespace
Update to latest expectations