Further to #3631
Upload missing coverage for unit tests and functional tests.
Unit Tests were executed as part of other tests, hence included coverage, however since they have been separated, and coverage not captured.

This issue along with #3631 caused coverage to drop to 50%.
Hopefully this will bring it back up to ~80%.