diff --git a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
index 3ebecc6622..7dae419717 100644
--- a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
+++ b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
@@ -29,8 +29,8 @@ public class SupervisorServiceImpl extends AbstractQueryService<Employee, Long>
     private SupervisorRepo supervisorRepo;
 
 
-    @PersistenceContext
-    private EntityManager em;
+//    @PersistenceContext
+//    private EntityManager em;
 
 
     @Autowired
@@ -46,14 +46,11 @@ public class SupervisorServiceImpl extends AbstractQueryService<Employee, Long>
 
     @Override
     public Iterable<Employee> findByUsersName(final Date dateCreated) {
-
-        //queryDslPredicateExecutor.findOne();
-
-
         QEmployee employee = QEmployee.employee;
         BooleanExpression lastName = employee.user.lastName.eq("Vahlman");
         BooleanExpression isNewEmployee = employee.user.dateCreated.eq(dateCreated);
-        return new JPAQuery(em).from(employee).where((lastName).and(isNewEmployee)).list(employee);
+        return queryDslPredicateExecutor.findAll((lastName).and(isNewEmployee));
+//return new JPAQuery(em).from(employee).where((lastName).and(isNewEmployee)).list(employee);
     }
 
 }
diff --git a/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java b/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java
index f7ef66d5fd..e340c1e48f 100644
--- a/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java
+++ b/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java
@@ -141,13 +141,17 @@ public class TestSupervisor {
     public void findEmployeeByName() {
         List<Employee> employeeList = new ArrayList<Employee>();
         Date dateCreated = new Date();
+        Employee hallberg = getEmployee("David", "Hallberg", "dhallb@dsv.su.se");
+        Employee tholerus = getEmployee("Torgny", "Tholerus", "torgny@dsv.su.se");
         Employee vahlman = getEmployee("Tom", "Vahlman", "tom@dsv.su.se");
+        Employee larsson = getEmployee("Ken", "Larsson", "kenlars@dsv.su.se");
         vahlman.getUser().setDateCreated(dateCreated);
         vahlman =  supervisorService.save(vahlman);
         for(Employee employee : supervisorService.findByUsersName(dateCreated)) {
             employeeList.add(employee);
         }
         assertFalse(employeeList.isEmpty());
+        assertTrue(employeeList.size() == 1);
         assertTrue(employeeList.get(0).equals(vahlman));
     }