partly fixed tests