Added the solutions for 17.4-17.7
Updated the unit testings for 17.4-17.7