fix spec for PR #6925 and other refactoring of ability spec
fix spec for PR #6925 and other refactoring of ability spec

vinayvinsol/spree,imella/spree,dafontaine/spree,ayb/spree,vinsol/spree,vinayvinsol/spree,vinayvinsol/spree,dafontaine/spree,calvinl/spree,dafontaine/spree,imella/spree,DarkoP/spree,brchristian/spree,maybii/spree,vinayvinsol/spree,siddharth28/spree,dafontaine/spree,maybii/spree,imella/spree,calvinl/spree,brchristian/spree,calvinl/spree,siddharth28/spree,maybii/spree,ayb/spree,siddharth28/spree,vinsol/spree,brchristian/spree,calvinl/spree,DarkoP/spree,ayb/spree,vinsol/spree,siddharth28/spree,DarkoP/spree,maybii/spree,DarkoP/spree,brchristian/spree,vinsol/spree,ayb/spree