Adding tests for conditional