More unity removals
Fix failing test
Allow orcle contraint ex since retries will handle them
Merge branch 'develop' into Conventions_refactor