Bug 1904 - Increased test coverage

Gist: https://gist.github.com/rszalski/89fdbb57a488e8cdf8f0