Changes in preparation for testing properties