Made params more consistent and transparent for test