Added initial set of unit tests. Slight code and readme cleanup.
Merge