Remove obsolete tests
Clarifications in tests