Merge branch 'CHEF-5052-plus-tests'

Fixes https://tickets.opscode.com/browse/CHEF-5052