Adding additional timeout catch in database statement.  No tests are affected.
New action tests, refactoring task runner into class for tests.  #414