Improve specs coverage