Removing duplicated test step function