updated tests to use trailing closure syntax and shorthand argument names where applicable
Merge remote-tracking branch 'origin/master'