Revisiting Trace and Testing Equivalences for Nondeterministic and Probabilistic Processes (Logical Methods in Computer Science, 2014)