Clean up var inheritance for properties
Clean up var inheritance for constants and add tests.