Add and fix specs