fixed tests failures