Change tests to use robolectric
Change tests to use robolectric
Merge commit '67f7bd19983b6f8b187dd80971c0f5a27a12c790' into add-fail-test