more refactoring in acceptance
specs correcteds