[COOK-4477] - Fix failing test suite

Signed-off-by: Sean OMeara <someara@opscode.com>
[COOK-4484] - Replace strip_leading_dir attribute with more general strip_components

Signed-off-by: Sean OMeara <someara@opscode.com>