More testing for Timeout
Light cleanup