move tests into their own directory
Hmmm I screwed up "git add -u" when moving these tests somehow.
[Stale edit] Remove some debugging.