Additional cleaning. Repairing tests.
17 files changed