Fixed tests - new model working