Get tests passing as-is

This gets the current tests passing again in chefspec. Although, they are expected to fail in Travis at the moment due to rubygems unstable state.
It's just getting very verbose and hard to follow on one screen unless you have a vertical monitor. It's easier to see the defaults at the top with explicit changes in the logic statement. Want me to add them back?