Convert test driver to functional form, add ClosureTest to look at performance issue with closures.