Fixes issue #6, add tests for functions with arguments
Remove regex match