Add remaining test for code coverage
Merge commit for code coverage