Updated tests with more complicated data, fixed regex

Resolves CHEF-4893
@opscode/client-eng