fixed simulation evaluation rules and enabled tests