Fixes on models and updated the fixture for current sprint