This is shorter, and makes it easier to move test files around. Change-Id: Ife3dcdd66b66a698d71b0fce2bce457410a4dd73