Removing superflus @inheritdoc and passing tests