Added tests, added extraction feature to InstantiatorDispatchHandler