Incorporated the two suggestions (h5 and named variables) and fixed the Spinach test.