fixed the old type (is it?), and changed the symbol reference to function reference
added a test
added tests (regarding #1)
Merge branch 'master' into original-with-test