Update spring and objectify libs, repair tests after that