fix param extraction and more test