included FindById test and model