Bug 948940 - Merge test_fm add_to_favorite and test_fm_remove_favorite