updated tests
fixed merge conflicts