Small prop name simplification, and add tests