Test cases fixed