Refactor model and add new controllers /test