Passing unit tests

:smile:
See my comment above on reusing the  code.