Fixing specs + refactoring Ability specs