Fix broken tests and add select 2 to the tags