Code cleanup. Fixed broken tests.
23 files changed