--- a
+++ b/recommendation-engine/src/test/java/eu/alfred/recommendation_engine/TagBasedEventsFinderTests.java
@@ -0,0 +1,98 @@
+package eu.alfred.recommendation_engine;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import eu.alfred.event_manager.client.EventManagerClient;
+import eu.alfred.event_manager.model.*;
+import eu.alfred.personalization_manager.client.PersonalProfileClient;
+import eu.alfred.personalization_manager.model.Address;
+import eu.alfred.personalization_manager.model.UserProfile;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class TagBasedEventsFinderTests {
+
+	// Not really unit tests since many different componentes (e.g., clients, services, dbs) come at play
+	// but trying to keep some track of how method performs
+	
+	private Event testEvent1 = new Event();
+	private EventManagerClient emClient = new EventManagerClient();
+	private String event1ID;
+	private UserProfile user1 = new UserProfile();
+	private PersonalProfileClient ppClient = new PersonalProfileClient();
+	private String user1Id;
+	private TagBasedEventsFinder tagFinder = new TagBasedEventsFinder();
+	private UserProfile createdUser;
+	private Event eventCreated;
+	private String testTagsEvent2Id;
+	private Event testTagsEvent2 = new Event();
+	private Event createdTestTagsEvent2 = new Event();
+	
+	@Before
+	public void setup() {
+		// Setup some instances
+		Calendar cal = Calendar.getInstance();
+		cal.add(Calendar.DAY_OF_YEAR, 2);
+		Date d = cal.getTime(); 
+				
+		// Create a control event in the DWH
+		event1ID = "1_event-" + UUID.randomUUID().toString();
+		testEvent1.setEventID(event1ID); 
+		testEvent1.setTags(Arrays.asList(new String[] {"arts","poetry"}));
+		testEvent1.setCategories(Arrays.asList(new String[] {"N.A."}));
+		Venue venueA = new Venue();
+		venueA.setCity("Utrecht");
+		testEvent1.setVenue(venueA);
+		testEvent1.setStart_date(d);
+		testEvent1.setEnd_date(d); 
+		Organizer tasos = new Organizer();
+		tasos.setName("Tasos");
+		testEvent1.setOrganizer(tasos);
+		testEvent1.setStatus("Live"); 
+		testEvent1.setTickets(Arrays.asList(new Tickets[] {}));
+		eventCreated = emClient.addEvent(testEvent1); 
+		
+		testTagsEvent2Id = "1_event-" + UUID.randomUUID().toString();
+		testTagsEvent2.setEventID(testTagsEvent2Id); 
+		testTagsEvent2.setTags(Arrays.asList(new String[] {"sports","golf"}));
+		testTagsEvent2.setCategories(Arrays.asList(new String[] {"N.A."}));		 
+		testTagsEvent2.setVenue(venueA);
+		testTagsEvent2.setStart_date(d);
+		testTagsEvent2.setEnd_date(d);  
+		testTagsEvent2.setOrganizer(tasos);
+		testTagsEvent2.setStatus("Live"); 
+		testTagsEvent2.setTickets(Arrays.asList(new Tickets[] {}));
+		createdTestTagsEvent2 = emClient.addEvent(testTagsEvent2);
+		
+		user1.setAlfredUserName("user1");
+		user1.setFirstName("tasos");
+		Address user1Address = new Address();
+		user1Address.setCity("Utrecht");
+		user1.setResidentialAddress(user1Address);
+		user1.setInterests(new String[] {"arts","poetry"});
+		user1.setDateOfBirth(new Date(Long.parseLong("-573091200000")));
+		user1Id = ppClient.createUserProfile(user1);
+		createdUser = (UserProfile)ppClient.retrieveUserProfile(user1Id).get(0);
+		
+	}
+	
+	@Test
+	public void testRetrievalOfEventsWithTagsOfInterest() { 
+		Set<Event> retrievedEvents = tagFinder.getEventsWithTagsOfInterest(createdUser); 
+		
+		System.out.println(retrievedEvents);
+		System.out.println(retrievedEvents.contains(eventCreated));
+		System.out.println(eventCreated);
+		
+		assertTrue(retrievedEvents.contains(eventCreated));
+		assertTrue(!retrievedEvents.contains(createdTestTagsEvent2));
+	}
+}