Solving the failing tests
Check point for app migration
cp1