tests refactoring. namespaces changed