Factored tests into hash of id => testdat