added test cases for conditionals