DcaeLocation tests and refactor

No match.