Increase test coverage.
Refactor deployment utility.
Refactor deployment utility.