Fix Robolectric tests
Merge branch 'content-provider' of github.com:zymurgeek/OnTap into content-provider