change namespace; better testing