All model test pass properly, finished restructuring model code