test
adding to the test more cases
resolved conflict