migrations added, tests added