Merge "Remove powermock to increase coverage"