added support for the conditional operator
added tests for the conditional operator