Issue #1966436 by follow-up by sun: Move tests to proper directory.