Added small unit tests to improve code coverage