[Remo/James] xed out tests causing side effects. Going to swap out mockito