Tests 4 and 5 passing; only 34 to go