Tests 21 and 22 passing