Fix failing powermock tests