More tests
Fix conflict