Added more stuff to the content provider. Bye-bye tests