avoid checking certain contracts in exceptional cases
updated comments for test cases
Merge branch 'feature/except' into develop