Finished migrations and base refactoring
Add fixture