fixed tests after merge