Updates to the controllers and tests.
Updates to the entities.