Improved: tests for Functions