Improve specs

Improve some specs