Fix formatting and imports
added TODO
Commit data to db during test; Fails due to deleting db after each test by Robolectric
fix db tests by using persisting db, but something is still not right

BUGGED!
add TODO