fixed tests accordingly