Adds challenge question 12
Adds tests for challenge 2 (question 13)