NullProperty enhancements and tests