Fixed tests for conditionals