uncommented and fixed tests