Change Bartik specific tests to Olivero in preparation for making Olivero the default