88% Cucumber and Some Policy Conditions Check fixes