Fixed a bug where operators could be matched against strings
Updated test code