cleaned up instances of MultipleTimes

Change-Id: I9bae9e293fe9fccce0a722709945db8f8a2a09ea
Implements: blueprint multiple-times-in-tests