Restored a good chunk of the lost load unit test.