Move to spring 4 and tests fixes