Tweak build so xml and binary tests don't have to suffer the forced delay