Subclassing should mean less tests too, yay!