Readded inherits, unbreaking tests