Refactor of destructured params in core, updated tests