Fix more Observable found during testing