Add second test verifying the time unit and timeout value fields of the
thrown exception
minor code review changes