Fix the itests.

Also needs review:
+ https://github.com/opscode/enterprise-chef-server-schema/pull/17
Update before shipping.