Add more tests for conditions