Corrected test and param building