Refactor tests #4583

what!!! self.configuration(1) I think.