Merge "Add --testdata flag for easier testing"