Adding complete bootstrap tests.  Only four failures to investigate!