added new test and missed commit
solve conflict