Remove the less invasive powermock stuff
Convert more tests to using pure mockito instead of powermock