TASQ-51: Improved code coverage to 80% on support package