implemented fake event polluter for tests
minor cleanings