Move test data dependencies to where they are used