Work In Progress
  Implmented tests for Flush, FlushAll, Script kill etc
  General cleanup