Code cleanup. Adding more tests.
3 files changed