Lock down namespace
Remove test dir