Fix migrations for testing purposes
Merge branch 'develop'