Improve Guardfile
Improve spec covarage