Wow, multiple choice. I love it! :-) Let's do (1) and don't worry about the test code that does a "new Property(TEST_PROPERTIES)" as the static TEST_PROPERTIES will never change.

Thanks! Great bug!