More work towards getting the tests bootstrapping using the new specialization model