Fix/extend specs