LPS-29962

Fixed the wrong import but didn't want to add yet another fix commit, so I squashed it and Sergio's param fix into the commit with the integration tests. You change about the sb size is correct.