added suppression tests, removed prefix from suppression string, other code review fixes