Better property picking. Added a helper function so we don't have to write a complicated ternary everywhere. Updated tests accordingly.