fixed namespace and test issues