First round of testing looks good.
added "setup"
  moved out of clean
Testing fixes