Splitting FunctionCallCollector from FunctionCallNotifier and adding entities to the model
Improving use of nose assertions: more generic imports, more specific assertions