Merge "Split up testHelpers.inc, break off fuzz testing"