Refactor remaining tests to use new functions.  Get rid of old exercise test.