Extended < and > tests with 'and' and 'or' of multiple cases
Added tests for 'and' and 'or'