Moving timeout resposibility for testing to the controller