Add tests
Improve config model