Code cleanup. Fixed broken tests.
17 files changed