repair errors
Add some model test