Timing fix in test
Minor 'remaining tries' cleanup