Simplifying TestProvider, adding second join