Add tests. Add Models