Updated test suite. functools, not funcutils you dolt!