Some changes in repo and consumer applicability
Updated applicability tests