Replaced DirtiesContext with mockito reset
Minor cleanup