Fixed test for namespaces
Merge branch '1.8'