Fixing tests and adding IfMatch.