fixed tests
fixed merge