Change timeout to 20secs, fix tests.