Download test objects
A little code cleanup