Fixed tests after updates