#1031: API tests updated.
Merge branch 'dev-1.7.0-api-upgrade' of github.com:devbridge/BetterCMS into dev-1.7.0-api-upgrade