Add some tests and generic locators