Added more tests for check_condition function
Merge branch 'master' into dev_v2