+ adapt spec to new stop conditions