Pass/Fail status updated properly
Refactored out more for feature flags