Added content provider and more tests. Weird stuff