Updated and cleaned up merge conflicts and added FavoritesTest