reorganize tests, prepare to refactor
move things around a bit