Removed obsolete tests, fixed expectations

Removed athost tests and unnecessary tests.
Fixed expectations on event retargeting.