Adding tests to problems 21 and 22