Improve spec covarage