Add solution for challenge 15
Add test for challenge 16

Fix test for challenge 16
Add solution for challenge 16