...done as a subsequentcheck as doing it as a BootstrapFixtureBase (which is the
easiest way) makes it depend on later modules in the dependency chain.

Change-Id: I9588bae409b38aa373ccfa855042f598b6e2bb2b