Rename/wipe some tests
Rename/wipe some tests