fixing a busted spec
cleaning up some commented code
adding a specific exception for timeouts