Added value to matches check.  Refactored tests slightly