Settled on a solution for the mockito objenesis mess!