SCORE-90. Fixing tests to reflect changes made to model def/env.