updated migrations, fixed tests