Merge pull request #65 from gtrifonov/dev

Adding more unit tests for jobs, locators/policies
Adding more unit tests