Add Content provider + tests