timeout and tests changes to satiate travis