Refactor to HibernateGenericDAO and some test / Configuration spring-services-context.xml