Add model location and modified others to pass the tests