Work In Progress
  Fixed issue with MULTI command return value
  More tests, primarily in MULTI/WATCH area
  Cleanup etc