Added mockito, separated web part from the database a bit more