Raised func test DEFAULT_WAIT_TIMEOUT to 60s

This is an attempt at fixing the random timeout failures we get on Travis.

**DO NOT MERGE UNTIL WE'RE SURE THIS FIXES THE PROBLEM.**