Added ContentProvider and tests