Fix spec tests now we've removed inherits.