Tests 8-13 updates