Maint/master/revert 6857 test changes and match fedora

My previous patch to this test resulted in a regression of coverage on windows and solaris.  This reverts and patches the fedora platform match instead.