Fix formatting issue in test log output.
Fix test.
Handle context canonicity and namespace segregation.