Fixed some spec tests