Merge "Make negative snapshot tests faster"