I agree that it's probably best to only require 'berkshelf/test' if an env variable like ['BERKSHELF_TEST'] is present. We can do that in a different PR.