Fix #22 - update unit tests