Also widen up @covers for the integration tests to let the coverage percentage increase from those. Change-Id: Ib9d42b124774b4c968c52f34e587059c63e8ffc2