Add model tests and an old file