Added database and refactored tests
Added content provider and tests