Added #TEST to problem12.  Solved problem 17.