Un-double the test doubles
10 files changed