Feature/1 remaining specs