Merge "removes self.fail as suggested by HACKING.rst"