Merge "SF: Shuffle test mocks into subdirs" into pi-dev