update and fixed tests