Timeout fixes and cleanups

done for [AGIOS-59](https://issues.jboss.org/browse/AGIOS-59)