Add unit tests. +Trivial renaming.
Merge pull request #2 from ivan-shaporov/dev

Add unit tests. +Trivial renaming.