Improve tests by looking at emitted events vs. actual implementation.