adding local data integration test and refactoring