Adding locators and methods for namespace cleanup

Required for automate_test cleanup