Added additional tests to satisfy code coverage
Minor cleanup