Tests were fixed
namespaces were improved