#JC-2032: Added missing tests
#JC-2032: Migration script fix