Couple tweaks to Exercise3 and it's unit test.
Merged master into solutions