Fixing some specs

:convenience_store: 

Closes #868