Rework base expectations against new instructinos