Fixed last lint nitpick, increased delays in tests.