Merge "DcaeLocation tests and refactor"