Try to create tests
 Fix conflicts