Also rationalize the test to see if a function has been called. Still not great, but getting there :)