Tests cleanup
Ported facebook migrated app tests