Cleanup
Removed func_name, no use for it.
Cleanup
Added some debug in test.py