pushing forward - DefaultInvoker small changes and even more testing
code... or something like that