fixed all base scenario tests