Add constant strings for property names.
Clean up tests.