spec fixes (update to newer FactoryGirl)
few library changes