Passing unit tests

:smile:
The current implementation is correct as per the old behaviour before the refactor. I saw something here that can be improved and made a TODO mark. Will make an issue now.