review feedback from @betravis: fixed a few more serializations & removed unit tokens from invalidValues