Remove last db call in tests, fully use content provider