Merge "Add support for External Store for unit tests"