Fixed use bugs from namespace and tests from structure change