Add/fix spec tests