Add tests, 6 int. and 1 for model