Updated models and corresponding tests