Bug 1520 - Increased test coverage