Add multisets and favourites. Rename a few unit tests and start the upload add