updated for spring 4.0.0.RELEASE and fixed breaking tests