Add tests
Fix conflict