Updating code to use convention based entity settings where possible.

Fixing broken tests