updating tests
merging