fixed tests which failed after merge