add test and correct models