Tests are finally passing, new param mapping method.