Fixed upgrade with timeout test. Closes #185

The end event is not received due to a missing data handler. This should address #185.