Added in unit tests. Fixing Issue #21