edited NAMESPACE and tests/, but tests files need to be fixed