Fix up spec tests