Fix/extend spec tests