updated property order, fixed test error