Use request and add a timeout
Remove deprecated from the tests