Increased code coverage
Minor typo corrections