Always call session#save and fixes to tests