Improve then promising done in event-based tests (the previous way had the potential of not re-throwing exceptions in some situations)