Added some additional tests for timeouts and nils