bunch of test cleanup, some renames