minor changes in test
solved merge conflict