Re-shaping the Test Pyramid