Tiny cleanup in tests and add robot speech TODO.