Fixes failing test caused by model property order