Include control editions in testing

This tightens up the tests to ensure that non-unpublished editions are
being ignored.