Few more unit tests