SOP-2659 Added support for Berkshelf testing.