Fix spec tests