Added func & tests for 21-29