Remove details in sanitized
small test refactoring
Rename
WIP