Adding tests for restricting lookups by class
Adding option to locators to limit classes allowed