Easier test setup, updated tests for non-typed method invocation.
Merge remote-tracking branch 'origin/master'