handle commented out properties and add back some unit tests