Fix tests for Visual Studio Code Coverage.
Merge remote-tracking branch 'origin/master' into AH-316_I_need_to_import_eb's