Removed superfluous annotation
Turned ClairvoyantContext into a SuiteMixin

and pushed down the use of the OneInstancePerTest mixin