Add new test and new model