Added DB Migration and tests