added tests and updated cervise, model and controller
added tests and updated cervise, model and controller