Fixed typo
Added a few easy tests for timeouts and returncodes