WIP tests and correct errors for fun call checks.