tests are updated
lots of cleanup