Merge "Reduce parralellism for testing"