Build param decoding into parsing
Minor test cleanup