Model and tests were modified