deleting old junk
some new tests, organization