Updated tests 21-23 based on feedback