[Bug 1414352] Re: Improve code coverage by adding tests