Fixed THUCYDIDES-160
Fixed issue with scenarios that were skipped due to a metafilter setting appearing as passing
Merged in some changes