create new tests
resolve conlict