Fixed tests that were still using the old XBOB names.