added tracking of functions
tested tracking of function calls
refactored tests
added arg count to calls