Updated unit tests for namespace changes.