tag_parser.py:: tagAnd was added, expands to ifThanElse, tests were added respectively