SOLVED: Problem 21 
ADDED: Problem 21 Test