Moved invocation log to ControllUser. Fixes #11
Fixed bug in test