Tests 6 & 7 passing; 32 to go