Make tests faster and store less in memory