Test cleanup: Removed lambda package (useless in Java because of generics) and renamed handler to listener (so as not to confuse with all our handle classes)