Improve NamespaceChecker test and class usage in client

Change-Id: I5c52d655d276f6e396890fba4b5f910f10756000
Merge "Improve NamespaceChecker test and class usage in client"