Feature #5950: Polish Facebook Test Case