Fix tests after berksfile merge.
Fix tests.

Conflicts:
	tests/test_command.py
	tests/test_runner.py
Fix test by loading cookbook_paths to fix
Fix test by loading cookbook_paths to fix
Merge tests fixes to broken branch.