further improvements in BDD tests framework
removed mock support from entitlement validator