Fix delete tests.
Organize code like new specification of adapters.