Simplified test builder after core meta builder modification.