Beef up testing, additional chef-solo support

- Don't search for server/cluster nodes on chef-solo, allow overrides
- Fixup tests to handle the chef-solo case but beef up check logic for fall through