Increase coverage of the api package
Support namespaces