TASQ-53: Finish code coverage improvement on project package