Fixed test cases as as well as error codes for timeouts.