Adding some more unit tests for better coverage