Adding more unit tests for jobs, locators/policies