Reformulated some spec cases