fix BDD method matching and delete timeout
Merge pull request #336 from waynepallen/pull-req-master-4f1516340fe3f3afae038fa6912d15bf4cfcb0cb

This pull looks reasonable and may address issues we are seeing.  I will accept and THEN test