Test coverage MethodInvocation and bug fixes