Fix bug where any identifier could be used as a user function and fixed parameter mis-match bug; test script updated to reflect fixes