Adding unit tests. Cleaning up code.
4 files changed