More extensions, tweaks to the test builder