Fix unit tests + add some more use cases