Increase test timeout to 40s from 20s, for travis to complete tests