Added suppression tests, changed suppresion string and bugpattern name. Other refactorings from code review