Changing model and adapting rules and tests for these changes