replaced and fixed tests