Merge "Added test scope to powermock dependency"