Update isFunction tests

Just some testing refactors of #1936