Adjusted namespaces
Added test map creation