Fixed all model test errors