Continues to write unit tests.
Fixed #22