more test cleanup; there are still problems
add note
fix location of tests
wip