improve Task Tests