pass complete handler from merge() to set()
increased timeout for benefit of Travis (?)