Adding unit tests. Minor code cleanup.
4 files changed