Adding specs around #152