Fixed broken tests (my bad). Dependencies changes to resolve some conflicts with older versions of spring.