Testing clean up.
  Made corrections to make sure all tests are passing.