Fix tests (mostly deleting stuff)