Passing unit tests

:smile:
Also unit tests aren't complete until this test is in the place (uncommented and OK)