Add very simple tests, fix the Lock thing, fix circular recursion things, fix counting wrapper as a function being called and from being used as the called_by_function_name