Test still timing out on travis - continuing to investigate