TASQ-51: Improve coverage for support package. Sorterts left.