Added couple of more unit tests