Fix the new tests to use the new way to make XBlocks.