Added better naming to common_params, and an assertion and test to boot